Removed unnecessary clutter in the code

final modifications made to clean up unnecessary variables/code as to not confuse future groups working on the project
